8c139e
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -255,7 +255,10 @@
public abstract class AbstractRequestLoggingFilter extends OncePerRequestFilter
 		msg.append(prefix);
 		msg.append("uri=").append(request.getRequestURI());
 		if (isIncludeQueryString()) {
-			msg.append('?').append(request.getQueryString());
+			String queryString = request.getQueryString();
+			if (queryString != null) {
+				msg.append('?').append(queryString);
+			}
 		}
 		if (isIncludeClientInfo()) {
 			String client = request.getRemoteAddr();
